use nullptr instead of empty functions (#432)

for function pointers passed to route_disp_all, track_disp_all
and ff_vecs_t exit.

diff --git a/alan.cc b/alan.cc
index be5d7424922296da28b58785170b37d34d8842be..8befabee0398b98ce58b8d19843251a0ce32f567 100644 (file)
--- a/alan.cc
+++ b/alan.cc
@@ -933,11 +933,6 @@ static void alan_wr_deinit()
   fout = nullptr;
 }
 
-
-static void alan_exit()
-{
-}
-
 /**************************************************************************/
 
 ff_vecs_t alanwpr_vecs = {
@@ -953,7 +948,7 @@ ff_vecs_t alanwpr_vecs = {
   alan_wr_deinit,
   wpr_read,
   wpr_write,
-  alan_exit,
+  nullptr,
   &wpr_args,
   CET_CHARSET_ASCII, 0, /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */
@@ -974,7 +969,7 @@ ff_vecs_t alantrl_vecs = {
   alan_wr_deinit,
   trl_read,
   trl_write,
-  alan_exit,
+  nullptr,
   &trl_args,
   CET_CHARSET_ASCII, 0, /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */

diff --git a/bcr.cc b/bcr.cc
index f82204aeb5d75d975dea1b96974654f7a3541a6c..21d684a98d238b4dd57a40dfe7f3ec410423cfa6 100644 (file)
--- a/bcr.cc
+++ b/bcr.cc
@@ -323,16 +323,6 @@ bcr_wr_deinit()
   gbfclose(fout);
 }
 
-static void
-bcr_route_trailer(const route_head*)
-{
-}
-
-static void
-bcr_write_wpt(const Waypoint*)
-{
-}
-
 static void bcr_write_line(gbfile* fout, const QString& key, const int* index, const QString& value)
 {
   if (value.isEmpty()) {                       /* this is mostly used in the world of windows */
@@ -473,7 +463,7 @@ bcr_data_write()
             target_rte_num, route_count());
   }
   curr_rte_num = 0;
-  route_disp_all(bcr_route_header, bcr_route_trailer, bcr_write_wpt);
+  route_disp_all(bcr_route_header, nullptr, nullptr);
 }
 
 ff_vecs_t bcr_vecs = {

diff --git a/dmtlog.cc b/dmtlog.cc
index 1514bf9a5c539ede6e0f15f5e471ef9b4c7f63cb..a70befafe0a8216f2ad3853781ddc3ab15fdbb49 100644 (file)
--- a/dmtlog.cc
+++ b/dmtlog.cc
@@ -756,11 +756,6 @@ track_hdr_cb(const route_head* trk)
   write_header(trk);
 }
 
-static void
-track_tlr_cb(const route_head*)
-{
-}
-
 static void
 track_wpt_cb(const Waypoint* wpt)
 {
@@ -807,7 +802,7 @@ dmtlog_write()
 
   header_written = 0;
   this_index = 0;
-  track_disp_all(track_hdr_cb, track_tlr_cb, track_wpt_cb);
+  track_disp_all(track_hdr_cb, nullptr, track_wpt_cb);
   if (!header_written) {
     write_header(nullptr);
   }

diff --git a/garmin.cc b/garmin.cc
index 0b94f79a313b820bf6ffb3031dbb7fcd10ad18e3..005634df4f009a88cd975a4b71059a34463ea95a 100644 (file)
--- a/garmin.cc
+++ b/garmin.cc
@@ -1110,11 +1110,6 @@ route_waypt_pr(const Waypoint* wpt)
   cur_tx_routelist_entry++;
 }
 
-static void
-route_noop(const route_head* )
-{
-}
-
 static void
 route_write()
 {
@@ -1127,7 +1122,7 @@ route_write()
     tx_routelist[i] = sane_GPS_Way_New();
   }
 
-  route_disp_all(route_hdr_pr, route_noop, route_waypt_pr);
+  route_disp_all(route_hdr_pr, nullptr, route_waypt_pr);
   GPS_Command_Send_Route(portname, tx_routelist, n);
 }
 
@@ -1171,7 +1166,7 @@ track_prepare()
     tx_tracklist[i] = GPS_Track_New();
   }
   my_track_count = 0;
-  track_disp_all(track_hdr_pr, route_noop, track_waypt_pr);
+  track_disp_all(track_hdr_pr, nullptr, track_waypt_pr);
 
   GPS_Prepare_Track_For_Device(&tx_tracklist, &n);
 

diff --git a/geo.cc b/geo.cc
index 8fbcc84cb1ec6d3aae14a32aa52d270a8bdad0e1..51ecca1848b7f5d6746940920b5390ed0f69fa9d 100644 (file)
--- a/geo.cc
+++ b/geo.cc
@@ -152,7 +152,6 @@ geocache_container wpt_container(const QString& args)
 static void
 geo_rd_deinit()
 {
-
 }
 
 static void

diff --git a/gopal.cc b/gopal.cc
index 78cb821f0c65ed5cf3bebaa642e0973b72876ebf..31f52b8724d604a714e068bb3460b8bbe7572b1a 100644 (file)
--- a/gopal.cc
+++ b/gopal.cc
@@ -332,17 +332,6 @@ gopal_read()
   }
 }
 
-static void
-gopal_route_hdr(const route_head*)
-{
-
-}
-
-static void
-gopal_route_tlr(const route_head*)
-{
-}
-
 static void
 gopal_write_waypt(const Waypoint* wpt)
 {
@@ -386,12 +375,7 @@ gopal_wr_deinit()
 static void
 gopal_write()
 {
-  route_disp_all(gopal_route_hdr, gopal_route_tlr, gopal_write_waypt);
-}
-
-static void
-gopal_exit()           /* optional */
-{
+  route_disp_all(nullptr, nullptr, gopal_write_waypt);
 }
 
 /**************************************************************************/
@@ -412,7 +396,7 @@ ff_vecs_t gopal_vecs = {
   gopal_wr_deinit,
   gopal_read,
   gopal_write,
-  gopal_exit,
+  nullptr,
   &gopal_args,
   CET_CHARSET_ASCII, 0 /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */

diff --git a/hiketech.cc b/hiketech.cc
index 6b44e8514d1ddd142555963c4c863b4deef665d0..b3bff748bba5c2a3d40696aee3c8cdc08c2ca013 100644 (file)
--- a/hiketech.cc
+++ b/hiketech.cc
@@ -242,7 +242,6 @@ void        ht_trk_s(xg_string, const QXmlStreamAttributes*)
 static
 void   ht_trk_e(xg_string, const QXmlStreamAttributes*)
 {
-
 }
 
 static

diff --git a/ignrando.cc b/ignrando.cc
index 2851f23df6a823442532092883d1fdde654e707d..111d2923de5b8f971473f7f8e65cd02bc907f815 100644 (file)
--- a/ignrando.cc
+++ b/ignrando.cc
@@ -187,11 +187,6 @@ ignr_write_track_hdr(const route_head* track)
   gbfprintf(fout, "\t</INFORMATIONS>\n");
 }
 
-static void
-ignr_write_track_trl(const route_head*)
-{
-}
-
 static void
 ignr_write_waypt(const Waypoint* wpt)
 {
@@ -239,7 +234,7 @@ ignr_write()
   gbfprintf(fout, "\t\t<HEURE>%s</HEURE>\n", buff);
 
   gbfprintf(fout, "\t</ENTETE>\n");
-  track_disp_all(ignr_write_track_hdr, ignr_write_track_trl, ignr_write_waypt);
+  track_disp_all(ignr_write_track_hdr, nullptr, ignr_write_waypt);
   gbfprintf(fout, "</RANDONNEE>\n");
 }
 

diff --git a/itracku.cc b/itracku.cc
index 2c0403ec902ddc429c1f3e6ea74885fc6b41be62..753632a4d6e97e0dcb0d66a565f22c5e476fa37b 100644 (file)
--- a/itracku.cc
+++ b/itracku.cc
@@ -653,11 +653,6 @@ itracku_write()
   waypt_disp_all(itracku_output_waypoint);
 }
 
-static void
-itracku_exit()         /* optional */
-{
-}
-
 static void
 itracku_rt_init(const QString& fname)
 {
@@ -779,7 +774,7 @@ ff_vecs_t itracku_vecs = {
   nullptr,
   itracku_read,
   nullptr,
-  itracku_exit,
+  nullptr,
   &itracku_args,
   CET_CHARSET_ASCII, 0, /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */
@@ -800,7 +795,7 @@ ff_vecs_t itracku_fvecs = {
   itracku_wr_deinit,
   itracku_read,
   itracku_write,
-  itracku_exit,
+  nullptr,
   &itracku_args,
   CET_CHARSET_ASCII, 0, /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */

diff --git a/magproto.cc b/magproto.cc
index 2e8bc8f210b28efdec149ecc54f82471e6c17982..47ec50c71e8660aaeb51da7cada23636b1f113f3 100644 (file)
--- a/magproto.cc
+++ b/magproto.cc
@@ -1400,11 +1400,6 @@ mag_waypt_pr(const Waypoint* waypointp)
   }
 }
 
-static
-void mag_track_nop(const route_head*)
-{
-}
-
 static
 void mag_track_disp(const Waypoint* waypointp)
 {
@@ -1456,7 +1451,7 @@ void mag_track_disp(const Waypoint* waypointp)
 static
 void mag_track_pr()
 {
-  track_disp_all(mag_track_nop, mag_track_nop, mag_track_disp);
+  track_disp_all(nullptr, nullptr, mag_track_disp);
 }
 
 /*
@@ -1530,16 +1525,11 @@ mag_route_trl(const route_head* rte)
   }
 }
 
-static void
-mag_route_hdr(const route_head*)
-{
-}
-
 static void
 mag_route_pr()
 {
   route_out_count = 0;
-  route_disp_all(mag_route_hdr, mag_route_trl, mag_waypt_pr);
+  route_disp_all(nullptr, mag_route_trl, mag_waypt_pr);
 
 }
 

diff --git a/mapfactor.cc b/mapfactor.cc
index 44b97a443648e6ca26f4fad891c7f3aca7d482ec..70ec2f77e0c40c9aaa4edaca86a15c5567415ec6 100644 (file)
--- a/mapfactor.cc
+++ b/mapfactor.cc
@@ -93,7 +93,6 @@ mapfactor_read()
 static void
 mapfactor_rd_deinit()
 {
-
 }
 
 static void

diff --git a/mapsend.cc b/mapsend.cc
index ed67f063206a946b61d936f9941dde410845d0f3..b8e3ccd101fac1abd2fa9dafaa91d8640fa4a7e7 100644 (file)
--- a/mapsend.cc
+++ b/mapsend.cc
@@ -363,12 +363,6 @@ mapsend_route_hdr(const route_head* rte)
   gbfputint32(rte->rte_waypt_ct, mapsend_file_out);
 }
 
-static void
-mapsend_noop(const route_head*)
-{
-  /* no-op */
-}
-
 static void
 mapsend_route_disp(const Waypoint* waypointp)
 {
@@ -495,7 +489,7 @@ static void mapsend_track_disp(const Waypoint* wpt)
 static void
 mapsend_track_write()
 {
-  track_disp_all(mapsend_track_hdr, mapsend_noop, mapsend_track_disp);
+  track_disp_all(mapsend_track_hdr, nullptr, mapsend_track_disp);
 }
 
 static void
@@ -520,7 +514,7 @@ mapsend_wpt_write()
       gbfputint32(route_waypt_count(), mapsend_file_out);
 
       /* write points - all routes */
-      route_disp_all(mapsend_noop, mapsend_noop, mapsend_waypt_pr);
+      route_disp_all(nullptr, nullptr, mapsend_waypt_pr);
     }
 
     int n = route_count();
@@ -528,7 +522,7 @@ mapsend_wpt_write()
     gbfputint32(n, mapsend_file_out);
 
     if (n) {
-      route_disp_all(mapsend_route_hdr, mapsend_noop, mapsend_route_disp);
+      route_disp_all(mapsend_route_hdr, nullptr, mapsend_route_disp);
     }
   }
 }

diff --git a/mapsource.cc b/mapsource.cc
index 82f6c1ae23ba21f77b03a5d93b4d0f4739122437..60e0796c5ab15900eb437213f5ea859eb5117bcc 100644 (file)
--- a/mapsource.cc
+++ b/mapsource.cc
@@ -117,12 +117,6 @@ QVector<arglist_t> mps_args = {
   },
 };
 
-static void
-mps_noop(const route_head*)
-{
-  /* no-op */
-}
-
 static void
 mps_wpt_q_init(QList<Waypoint *>* whichQueue)
 {
@@ -1949,7 +1943,7 @@ mps_write()
        waypoints without consideration for uniqueness for "real" waypoints that haven't
        been output (phew!)
     */
-    route_disp_all(mps_noop, mps_noop, mps_route_wpt_w_unique_wrapper);
+    route_disp_all(nullptr, nullptr, mps_route_wpt_w_unique_wrapper);
 
     route_disp_all(mps_routehdr_w_wrapper, mps_routetrlr_w_wrapper, mps_routedatapoint_w_wrapper);
   }
@@ -2002,7 +1996,7 @@ mps_write()
         gbfread(&recType, 1, 1, mps_file_temp);
       }
     }
-    track_disp_all(mps_trackhdr_w_wrapper, mps_noop, mps_trackdatapoint_w_wrapper);
+    track_disp_all(mps_trackhdr_w_wrapper, nullptr, mps_trackdatapoint_w_wrapper);
   }
 
   if (mpsmergeout) {

diff --git a/nmn4.cc b/nmn4.cc
index 2b40b2889fa9c0c01be7b9af4a497af392b586ea..9a6bddd87e12af7aac9facac488ea26a8d82fc40 100644 (file)
--- a/nmn4.cc
+++ b/nmn4.cc
@@ -182,11 +182,6 @@ nmn4_route_hdr(const route_head*)
   curr_rte_num++;
 }
 
-static void
-nmn4_route_tlr(const route_head*)
-{
-}
-
 static void
 nmn4_write_waypt(const Waypoint* wpt)
 {
@@ -230,7 +225,7 @@ nmn4_write_data()
   }
 
   curr_rte_num = 0;
-  route_disp_all(nmn4_route_hdr, nmn4_route_tlr, nmn4_write_waypt);
+  route_disp_all(nmn4_route_hdr, nullptr, nmn4_write_waypt);
 }
 
 

diff --git a/pocketfms_bc.cc b/pocketfms_bc.cc
index 4aaf9b19bfb1edceef1b6549dcd5a35cc613afc3..8e7c136efd5b699534622770aebe78431fc32da1 100644 (file)
--- a/pocketfms_bc.cc
+++ b/pocketfms_bc.cc
@@ -119,11 +119,6 @@ read_tracks()
   }
 }
 
-static void
-route_head_noop(const route_head*)
-{
-}
-
 static void
 pocketfms_waypt_disp(const Waypoint* wpt)
 {
@@ -169,7 +164,7 @@ data_read()
 static void
 data_write()
 {
-  track_disp_all(route_head_noop, route_head_noop, pocketfms_waypt_disp);
+  track_disp_all(nullptr, nullptr, pocketfms_waypt_disp);
 }
 
 ff_vecs_t pocketfms_bc_vecs = {

diff --git a/psitrex.cc b/psitrex.cc
index 7fc1d8ed295ab40b8f6519821c67c2605d7d78de..492491f758e8d667b095570dffb0d286ae3fad19 100644 (file)
--- a/psitrex.cc
+++ b/psitrex.cc
@@ -731,12 +731,6 @@ psit_read()
 #endif
 }
 
-static void
-psit_noop(const route_head*)
-{
-  /* no-op */
-}
-
 static void
 psit_write()
 {
@@ -759,11 +753,11 @@ psit_write()
     waypt_disp_all(psit_waypoint_w_wrapper);
   }
   if (global_opts.objective == rtedata) {
-    route_disp_all(psit_routehdr_w_wrapper, psit_noop, psit_waypoint_w_wrapper);
+    route_disp_all(psit_routehdr_w_wrapper, nullptr, psit_waypoint_w_wrapper);
   }
   if (global_opts.objective == trkdata) {
     track_disp_all(psit_trackhdr_w_wrapper,
-                   psit_noop, psit_trackdatapoint_w_wrapper);
+                   nullptr, psit_trackdatapoint_w_wrapper);
   }
 
   mkshort_del_handle(&mkshort_handle);

diff --git a/sbn.cc b/sbn.cc
index acdd8e36e6442c243c9b1819bf2c06ddb7c4d78f..2cb4bba4f84ce53826771b89d21872b920336cb2 100644 (file)
--- a/sbn.cc
+++ b/sbn.cc
@@ -298,11 +298,6 @@ sbn_read()
   }
 }
 
-static void
-sbn_exit()
-{
-}
-
 /**********************************************************************/
 
 ff_vecs_t sbn_vecs = {
@@ -318,7 +313,7 @@ ff_vecs_t sbn_vecs = {
   nullptr,
   sbn_read,
   nullptr,
-  sbn_exit,
+  nullptr,
   &sbn_args,
   /* Characters are always encoded in ASCII. Even if the unit is set
    * to Chinese language, only ASCII characters can be entered. */

diff --git a/sbp.cc b/sbp.cc
index e594d9520161ac63a3d83e9bc21d13360805c261..24e27f4f5f06c1c3242442a7faa554576022bec8 100644 (file)
--- a/sbp.cc
+++ b/sbp.cc
@@ -108,11 +108,6 @@ sbp_read()
   }
 }
 
-static void
-sbp_exit()
-{
-}
-
 /**************************************************************************/
 
 ff_vecs_t sbp_vecs = {
@@ -128,7 +123,7 @@ ff_vecs_t sbp_vecs = {
   nullptr,
   sbp_read,
   nullptr,
-  sbp_exit,
+  nullptr,
   &sbp_args,
   CET_CHARSET_ASCII, 0                 /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */

diff --git a/teletype.cc b/teletype.cc
index 2a8f49702d683e78fccfd99481e0e4271c3c7d51..4646065332385064e08afc13ff272506d6230fdd 100644 (file)
--- a/teletype.cc
+++ b/teletype.cc
@@ -88,11 +88,6 @@ teletype_read()
   }
 }
 
-static void
-teletype_exit()                /* optional */
-{
-}
-
 /**************************************************************************/
 
 // capabilities below means: we can only read and write waypoints
@@ -111,7 +106,7 @@ ff_vecs_t teletype_vecs = {
   nullptr,
   teletype_read,
   nullptr,
-  teletype_exit,
+  nullptr,
   &teletype_args,
   CET_CHARSET_ASCII, 0                 /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */

diff --git a/xcsv.cc b/xcsv.cc
index ed93d05482a45dfdde341edfce2a75091d32812c..84e605051e9f0dbcebe14eb9141748539571e329 100644 (file)
--- a/xcsv.cc
+++ b/xcsv.cc
@@ -1756,13 +1756,6 @@ xcsv_waypt_pr(const Waypoint* wpt)
   waypt_out_count++;
 }
 
-static void
-xcsv_noop(const route_head* wp)
-{
-  (void)wp;
-  /* no-op */
-}
-
 // return |original| after performing token replacement.
 static QString
 xcsv_replace_tokens(const QString& original) {
@@ -1810,10 +1803,10 @@ xcsv_data_write()
     waypt_disp_all(xcsv_waypt_pr);
   }
   if ((xcsv_file.datatype == 0) || (xcsv_file.datatype == rtedata)) {
-    route_disp_all(xcsv_resetpathlen,xcsv_noop,xcsv_waypt_pr);
+    route_disp_all(xcsv_resetpathlen, nullptr, xcsv_waypt_pr);
   }
   if ((xcsv_file.datatype == 0) || (xcsv_file.datatype == trkdata)) {
-    track_disp_all(xcsv_resetpathlen,xcsv_noop,xcsv_waypt_pr);
+    track_disp_all(xcsv_resetpathlen, nullptr, xcsv_waypt_pr);
   }
 
   /* output epilogue lines, if any. */